Merge pull request #91 from eoyilmaz/77-rename-osx-to-macos

77 rename osx to macos

.gitignore

@@ -1,6 +1,7 @@
 .cache/*
 .coverage
 .DS_Store
+.env
 .pytest_cache
 .venv/
 .vscode/

README.rst

@@ -113,7 +113,7 @@ Create a ``Repository`` for project files to be saved under:
         name='Commercial Projects Repository',
         windows_path='Z:/Projects',
         linux_path='/mnt/Z/Projects',
-        osx_path='/Volumes/Z/Projects'
+        macos_path='/Volumes/Z/Projects'
     )
 
 Create a ``FilenameTemplate`` (to be used as file naming convention):

alembic/versions/feca9bac7d5a_renamed_osx_to_macos.py

@@ -0,0 +1,26 @@
+"""Renamed OSX to macOS
+
+Revision ID: feca9bac7d5a
+Revises: bf67e6a234b4
+Create Date: 2024-11-01 12:22:24.818481
+"""
+
+from alembic import op
+
+import sqlalchemy as sa
+
+
+
+# revision identifiers, used by Alembic.
+revision = 'feca9bac7d5a'
+down_revision = 'bf67e6a234b4'
+
+
+def upgrade():
+    """Upgrade the tables."""
+    op.alter_column("Repositories", "osx_path", new_column_name="macos_path")
+
+
+def downgrade():
+    """Downgrade the tables."""
+    op.alter_column("Repositories", "macos_path", new_column_name="osx_path")

docs/source/_static/images/stalker_design.vue

@@ -3750,7 +3750,7 @@
             <URIString>http://vue.tufts.edu/rdf/resource/73db9f4c7f0001010b45ad3de656431d</URIString>
             <shape arcwidth="20.0" archeight="20.0" xsi:type="roundRect"/>
         </child>
-        <child ID="2193" label="osx_path | UNICODE"
+        <child ID="2193" label="macos_path | UNICODE"
             created="1290433929378" x="34.0" y="43.25" width="126.0"
             height="23.0" strokeWidth="1.0" autoSized="true" xsi:type="node">
             <fillColor>#F2AE45</fillColor>

docs/source/design.rst

@@ -221,7 +221,7 @@ Here is the code::
       name='Commercials Repo',
       linux_path='/mnt/T/Commercials/',
       windows_path='T:/Commercials/',
-      osx_path='/Volumes/T/Commercials/'
+      macos_path='/Volumes/T/Commercials/'
   )
 
   commercial_structure = Structure(

docs/source/installation.rst

@@ -16,7 +16,7 @@ Install Python
 
 Stalker is completely written with Python, so it requires Python. It currently
 works with Python version 2.6 and 2.7. So you first need to have Python
-installed in your system. On Linux and OSX there is a system wide Python
+installed in your system. On Linux and macOS there is a system wide Python
 already installed. For Windows, you need to download the Python installer
 suitable for your Windows operating system (32 or 64 bit) from `Python.org`_
 
@@ -33,7 +33,7 @@ bootstrap script.
 Installing `setuptools` with `ez_setup`:
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-These steps are generally needed just for Windows. Linux and OSX users can skip
+These steps are generally needed just for Windows. Linux and macOS users can skip
 this part.
 
 1. download `ez_setup.py`_

docs/source/tutorial.rst

@@ -42,7 +42,7 @@ database::
 
 or::
 
-  db.setup({"sqlalchemy.url": "sqlite:////home/ozgur/studio.db"}) # under linux or osx
+  db.setup({"sqlalchemy.url": "sqlite:////home/ozgur/studio.db"}) # under linux or macos
 
 .. ::
    This command will do the following:
@@ -519,15 +519,15 @@ task.
    On a linux system this should be fairly straight forward, just install
    `TaskJuggler`_ and stalker will be able to use it.
 
-   But for other OSes, like OSX and Windows, you should create an environment
+   But for other OSes, like macOS and Windows, you should create an environment
    variable called ``STALKER_PATH`` and then place a file called ``config.py``
    inside the folder that this path is pointing at. And then add the following
    to this ``config.py``::
 
      tj_command = 'C:\\Path\\to\\tj3.exe'
 
    The default value for ``tj_command`` config variable is
-   ``/usr/local/bin/tj3``, so if on a Linux or OSX system when you run::
+   ``/usr/local/bin/tj3``, so if on a Linux or macOS system when you run::
 
      which tj3
 
@@ -631,7 +631,7 @@ create our projects into. Lets enter the paths for all the major operating
 systems::
 
   commercial_repo.linux_path   = "/mnt/M/commercials"
-  commercial_repo.osx_path     = "/Volumes/M/commercials"
+  commercial_repo.macos_path   = "/Volumes/M/commercials"
   commercial_repo.windows_path = "M:/commercials"  # you can use reverse
                                                    # slashes (\\) if you want
 
@@ -645,7 +645,7 @@ correct answer according to your operating system::
   # in Linux and variants:
   # /mnt/M/commercials
   #
-  # and in OSX:
+  # and in macOS:
   # /Volumes/M/commercials
 
 .. note::

docs/source/tutorial_files/tutorial.py

@@ -212,7 +212,7 @@
 print(new_project.to_tjp)
 
 commercial_repo.linux_path = "/mnt/M/commercials"
-commercial_repo.osx_path = "/Volumes/M/commercials"
+commercial_repo.macos_path = "/Volumes/M/commercials"
 commercial_repo.windows_path = "M:/commercials"  # you can use reverse slashes
 # (\\) if you want
 
@@ -223,7 +223,7 @@
 # in Linux and variants:
 # /mnt/M/commercials
 #
-# and in OSX:
+# and in macOS:
 # /Volumes/M/commercials
 
 

docs/source/upgrade_db.rst

@@ -23,7 +23,7 @@ installation directory::
   # for Windows
   ..\Scripts\alembic.exe upgrade head
 
-  # for Linux or OSX
+  # for Linux or macOS
   ../bin/alembic upgrade head
 
   # this should output something like that:

examples/flat_project_example.py

@@ -34,7 +34,7 @@
 repo = Repository(
     name="Test Repository",
     linux_path="/mnt/T/stalker_tests/",
-    osx_path="/Volumes/T/stalker_tests/",
+    macos_path="/Volumes/T/stalker_tests/",
     windows_path="T:/stalker_tests/",
 )
 

src/stalker/db/setup.py

@@ -34,7 +34,7 @@
 logger = log.get_logger(__name__)
 
 # TODO: Try to get it from the API (it was not working inside a package before)
-alembic_version = "bf67e6a234b4"
+alembic_version = "feca9bac7d5a"
 
 
 def setup(settings=None):